Backport: Avoid buffer read-only error in ibuffer-diff-buffer-with-file-1

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e75c2d718f069714388c8155b53af31c59b42bd..8196cae2056ef7db5c8d18451fcedbb30f24087e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-06-24  Leo Liu  <sdl.web@gmail.com>
 
+       * ibuf-ext.el (ibuffer-diff-buffer-with-file-1): Avoid buffer
+       read-only error.
+
        * net/rcirc.el (rcirc): Avoid error when process-contact returns t.
 
        * vc/diff-mode.el (diff-file-prev/next): Fix typo.

diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 22ec2f5df1fc4c4348f4d1a8e88d5761bbb18f94..4c9dfc213cecb2541818ffa5c6ed13633d0bb359 100644 (file)
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1345,8 +1345,8 @@ a prefix argument reverses the meaning of that variable."
                (diff-sentinel
                 (call-process shell-file-name nil
                               (current-buffer) nil
-                              shell-command-switch command)))
-             (insert "\n"))))
+                              shell-command-switch command))
+               (insert "\n")))))
       (sit-for 0)
       (when (file-exists-p tempfile)
        (delete-file tempfile)))))